Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 15 Jun 2010 08:18:19 +0000 (08:18 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 15 Jun 2010 08:18:19 +0000 (08:18 +0000)

Trivial merge